Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 3 Jun 2010 12:01:23 +0000 (12:01 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 3 Jun 2010 12:01:23 +0000 (12:01 +0000)
commite20d59ea958d1ad33ad22c2aaef73b97ad8307e4
tree5c666d859c80adf987fdbdff68932691730636a5
parent15e33dbbb2c645956c62c2ec438c976dd3aa3fad
parent5e7797f17b617c07668ccd71e82ac74f955f988f
Merge from mainline.